bitkeeper revision 1.1159.153.1 (4188ec74U7gi2rpg0N_8N4PDuuf8Hg)

Cleanup NetBSD build system.

diff --git a/buildconfigs/Rules.mk b/buildconfigs/Rules.mk
index 8167d5f386cfa53f873ea0cb91dc1e27b1495d4e..17826830f369c19543903cfde804bfe5fa31d0b4 100644 (file)
--- a/buildconfigs/Rules.mk
+++ b/buildconfigs/Rules.mk
@@ -31,8 +31,12 @@ LINUX_26SRC := ./linux-$(LINUX_26VER).tar.bz2
 endif
 
 pristine-linux-$(LINUX_26VER): $(LINUX_26SRC)
-       rm -rf tmp-linux-$(LINUX_26VER) $@ && mkdir -p tmp-linux-$(LINUX_26VER) && tar -C tmp-linux-$(LINUX_26VER) -jxf $(LINUX_26SRC) && mv tmp-linux-$(LINUX_26VER)/* $@ ; rm -rf tmp-linux-$(LINUX_26VER)
+       rm -rf tmp-linux-$(LINUX_26VER) $@ && \
+       mkdir -p tmp-linux-$(LINUX_26VER) && \
+       tar -C tmp-linux-$(LINUX_26VER) -jxf $(LINUX_26SRC) && \
+       mv tmp-linux-$(LINUX_26VER)/* $@
        touch $@ # update timestamp to avoid rebuild
+       @rm -rf tmp-linux-$(LINUX_26VER)
 
 
 # search for a pristine kernel tar ball, or try downloading one
@@ -44,8 +48,12 @@ LINUX_24SRC := ./linux-$(LINUX_24VER).tar.bz2
 endif
 
 pristine-linux-$(LINUX_24VER): $(LINUX_24SRC)
-       rm -rf tmp-linux-$(LINUX_24VER) $@ && mkdir -p tmp-linux-$(LINUX_24VER) && tar -C tmp-linux-$(LINUX_24VER) -jxf $(LINUX_24SRC) && mv tmp-linux-$(LINUX_24VER)/* $@ ; rm -rf tmp-linux-$(LINUX_24VER)
+       rm -rf tmp-linux-$(LINUX_24VER) $@ && \
+       mkdir -p tmp-linux-$(LINUX_24VER) && \
+       tar -C tmp-linux-$(LINUX_24VER) -jxf $(LINUX_24SRC) && \
+       mv tmp-linux-$(LINUX_24VER)/* $@ && \
        touch $@ # update timestamp to avoid rebuild
+       @rm -rf tmp-linux-$(LINUX_24VER)
 
 linux-$(LINUX_24VER)-xen.patch: pristine-linux-$(LINUX_24VER)  
        rm -rf tmp-$@
@@ -69,4 +77,4 @@ mrproper:
        rm -rf pristine-linux-$(LINUX_24VER) linux-$(LINUX_24VER).tar.bz2
        rm -rf pristine-linux-$(LINUX_26VER) linux-$(LINUX_26VER).tar.bz2
        rm -rf linux-$(LINUX_24VER)-xen.patch linux-$(LINUX_26VER)-xen.patch
-       rm -rf pristine-netbsd-2.0
+       rm -rf pristine-netbsd-2.0 netbsd-2.0-tools

diff --git a/buildconfigs/mk.netbsd-2.0-xenU b/buildconfigs/mk.netbsd-2.0-xenU
index f5f34c0eb100e40904e02dccd38b577ed5faf2cd..0e2ae60faa33b8d7806876826a669e8d63bdbada 100644 (file)
--- a/buildconfigs/mk.netbsd-2.0-xenU
+++ b/buildconfigs/mk.netbsd-2.0-xenU
@@ -20,8 +20,6 @@ NETBSD_SRC       ?= $(firstword $(foreach dir,$(subst :, ,$(NETBSD_SRC_PATH)),\
 NETBSD_TOOLS_SRC ?= $(firstword $(foreach dir,$(subst :, ,$(NETBSD_SRC_PATH)),\
                     $(wildcard $(dir)/netbsd-$(NETBSD_VER)-tools.tar.*z*)))
 
-NETBSD_TREES := netbsd-$(NETBSD_VER)-xenU
-
 build: $(NETBSD_DIR) netbsd-$(EXTRAVERSION)
 
 netbsd-$(NETBSD_VER)-xen-kernel-$(NETBSD_CVSSNAP).tar.bz2:
@@ -32,8 +30,12 @@ NETBSD_SRC := ./netbsd-$(NETBSD_VER)-xen-kernel-$(NETBSD_CVSSNAP).tar.bz2
 endif
 
 pristine-netbsd-$(NETBSD_VER): $(NETBSD_SRC)
-       rm -rf tmp-netbsd-$(NETBSD_VER) $@ && mkdir -p tmp-netbsd-$(NETBSD_VER) && tar -C tmp-netbsd-$(NETBSD_VER) -jxf $(NETBSD_SRC) && mv tmp-netbsd-$(NETBSD_VER)/* $@
+       rm -rf tmp-netbsd-$(NETBSD_VER) $@ && \
+       mkdir -p tmp-netbsd-$(NETBSD_VER) && \
+       tar -C tmp-netbsd-$(NETBSD_VER) -jxf $(NETBSD_SRC) && \
+       mv tmp-netbsd-$(NETBSD_VER)/* $@
        touch $@ # update timestamp to avoid rebuild
+       @rm -rf tmp-netbsd-$(NETBSD_VER)
 
 pristine-netbsd-tools-src: 
 ifeq ($(NETBSD_TOOLS_SRC),)
@@ -55,11 +57,13 @@ $(NETBSD_DIR): netbsd-tools pristine-netbsd-$(NETBSD_VER)
           ./mkbuildtree ../$(NETBSD_DIR) )
 
 # build the specified netbsd tree
-NBDIR = $(subst netbsd-,netbsd-$(NETBSD_VER)-,$@)
 netbsd-xen%:   
-       $(MAKE) -C $(NBDIR) config
-       $(MAKE) -C $(NBDIR) netbsd
-       $(MAKE) -C $(NBDIR) INSTALL_PATH=$(INSTALL_DIR) INSTALL_NAME=boot/netbsd-$(NETBSD_VER)-$(subst netbsd-,,$@) install
+       $(MAKE) -C netbsd-$(FULLVERSION) config
+       $(MAKE) -C netbsd-$(FULLVERSION) netbsd
+       $(MAKE) -C netbsd-$(FULLVERSION) INSTALL_PATH=$(INSTALL_DIR) INSTALL_NAME=boot/netbsd-$(NETBSD_VER)-$(subst netbsd-,,$@) install
+
+clean:
+       $(MAKE) -C netbsd-$(FULLVERSION) clean
 
 delete:
-       rm -rf $(NETBSD_TREES)
+       rm -rf tmp-netbsd-$(NETBSD_VER) $(NETBSD_DIR)

diff --git a/netbsd-2.0-xen-sparse/Makefile b/netbsd-2.0-xen-sparse/Makefile
index def3b4427e5bf56deed9f28a30375730ddd08e99..da82172aad0450582d1ea30665496f15e3f456f5 100644 (file)
--- a/netbsd-2.0-xen-sparse/Makefile
+++ b/netbsd-2.0-xen-sparse/Makefile
@@ -2,12 +2,16 @@
 #
 #
 
-.PHONY: config netbsd
+.PHONY: clean config install netbsd
 
 TOPDIR         ?= $(shell pwd)
 NETBSD_RELEASE ?= $(patsubst netbsd-%-xen%,%,$(notdir $(TOPDIR)))
 NETBSD_VER     ?= $(patsubst netbsd-%-xen%,%,$(notdir $(TOPDIR)))
 
+clean:
+       @mkdir -p compile/XEN
+       cd compile/XEN && TOPDIR=$(TOPDIR) NETBSD_VER=$(NETBSD_VER) ../../nbmake-xen cleandir
+
 config:
        @mkdir -p compile/XEN
        cd compile/XEN && TOPDIR=$(TOPDIR) NETBSD_VER=$(NETBSD_VER) ../../nbconfig-xen XEN